Added a toast, fixed minor layout stuff