Small fixes, now expands server when notification is clicked in a new
activity